Support for NXP's i.MX8QX SoC
authorAnson Huang <[email protected]>
Tue, 5 Jun 2018 08:13:45 +0000 (16:13 +0800)
committerAnson Huang <[email protected]>
Tue, 19 Jun 2018 02:24:32 +0000 (10:24 +0800)
NXP's i.MX8QX is an ARMv8 SoC with 4 Cortex-A35 cores and
system controller (Cortex-M4) inside, documentation can
be found in below link:

https://www.nxp.com/products/processors-and-microcontrollers/
applications-processors/i.mx-applications-processors/i.mx-8-processors:IMX8-SERIES

This patch adds support for booting up SMP linux kernel (v4.9).

Signed-off-by: Anson Huang <[email protected]>
docs/plat/imx8.rst [new file with mode: 0644]
maintainers.rst
plat/imx/common/include/imx8qx_pads.h [new file with mode: 0644]
plat/imx/imx8qx/imx8qx_bl31_setup.c [new file with mode: 0644]
plat/imx/imx8qx/imx8qx_psci.c [new file with mode: 0644]
plat/imx/imx8qx/include/platform_def.h [new file with mode: 0644]
plat/imx/imx8qx/include/sec_rsrc.h [new file with mode: 0644]
plat/imx/imx8qx/platform.mk [new file with mode: 0644]

diff --git a/docs/plat/imx8.rst b/docs/plat/imx8.rst
new file mode 100644 (file)
index 0000000..a56d0f1
--- /dev/null
@@ -0,0 +1,54 @@
+Description
+===========
+
+The i.MX 8 series of applications processors is a feature- and
+performance-scalable multi-core platform that includes single-,
+dual-, and quad-core families based on the Arm® Cortex®
+architecture—including combined Cortex-A72 + Cortex-A53,
+Cortex-A35, and Cortex-M4 based solutions for advanced graphics,
+imaging, machine vision, audio, voice, video, and safety-critical
+applications.
+
+The i.MX8QX is with 4 Cortex-A35 ARM core and 1 Cortex-M4 system
+controller.
+
+The System Controller (SC) represents the evolution of centralized
+control for system-level resources on i.MX8. The heart of the system
+controller is a Cortex-M4 that executes system controller firmware.
+
+Boot Sequence
+=============
+
+Bootrom --> BL31 --> BL33(u-boot) --> Linux kernel
+
+How to build
+============
+
+Build Procedure
+---------------
+
+-  Prepare AARCH64 toolchain.
+
+-  Build System Controller Firmware and u-boot firstly, and get binary images: scfw_tcm.bin and u-boot.bin
+
+-  Build TF-A
+
+   Build bl31:
+
+   .. code:: shell
+
+       CROSS_COMPILE=aarch64-linux-gnu- make PLAT=<Target_SoC> bl31
+
+   Target_SoC should be "imx8qx" for i.MX8QX SoC.
+
+Deploy TF-A Images
+-----------------
+
+TF-A binary(bl31.bin), scfw_tcm.bin and u-boot.bin are combined together
+to generate a binary file called flash.bin, the imx-mkimage tool is used
+to generate flash.bin, and flash.bin needs to be flashed into SD card
+with certain offset for BOOT ROM. The system controller firmware,
+u-boot and imx-mkimage will be upstreamed soon, this doc will be updated
+once they are ready, and the link will be posted.
+
+.. _i.MX8: https://www.nxp.com/products/processors-and-microcontrollers/applications-processors/i.mx-applications-processors/i.mx-8-processors/i.mx-8-family-arm-cortex-a53-cortex-a72-virtualization-vision-3d-graphics-4k-video:i.MX8
index 2217cbe010f8f152dec67f1ebc49979144b75f6f..195f1f3cc8098e350ef5244898102091e5041ca0 100644 (file)
@@ -92,6 +92,16 @@ Files:
 -  docs/plat/ls1043a.rst
 -  plat/layerscape/\*
 
+NXP i.MX 8 platform sub-maintainer
+--------------------------------------
+
+Anson Huang ([email protected], `Anson-Huang`_)
+
+Files:
+
+-  docs/plat/imx8.rst
+-  plat/imx/\*
+
 Raspberry Pi 3 platform sub-maintainer
 --------------------------------------
 
diff --git a/plat/imx/common/include/imx8qx_pads.h b/plat/imx/common/include/imx8qx_pads.h
new file mode 100644 (file)
index 0000000..0e153bb
--- /dev/null
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*!
+ * Header file used to configure SoC pad list.
+ */
+
+#ifndef SC_PADS_H
+#define SC_PADS_H
+
+/* Includes */
+
+/* Defines */
+
+/*!
+ * @name Pad Definitions
+ */
+/*@{*/
+#define SC_P_PCIE_CTRL0_PERST_B                  0     /* HSIO.PCIE0.PERST_B, LSIO.GPIO4.IO00 */
+#define SC_P_PCIE_CTRL0_CLKREQ_B                 1     /* HSIO.PCIE0.CLKREQ_B, LSIO.GPIO4.IO01 */
+#define SC_P_PCIE_CTRL0_WAKE_B                   2     /* HSIO.PCIE0.WAKE_B, LSIO.GPIO4.IO02 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_PCIESEP       3     /*  */
+#define SC_P_USB_SS3_TC0                         4     /* ADMA.I2C1.SCL, CONN.USB_OTG1.PWR, CONN.USB_OTG2.PWR, LSIO.GPIO4.IO03 */
+#define SC_P_USB_SS3_TC1                         5     /* ADMA.I2C1.SCL, CONN.USB_OTG2.PWR, LSIO.GPIO4.IO04 */
+#define SC_P_USB_SS3_TC2                         6     /* ADMA.I2C1.SDA, CONN.USB_OTG1.OC, CONN.USB_OTG2.OC, LSIO.GPIO4.IO05 */
+#define SC_P_USB_SS3_TC3                         7     /* ADMA.I2C1.SDA, CONN.USB_OTG2.OC, LSIO.GPIO4.IO06 */
+#define SC_P_COMP_CTL_GPIO_3V3_USB3IO            8     /*  */
+#define SC_P_EMMC0_CLK                           9     /* CONN.EMMC0.CLK, CONN.NAND.READY_B, LSIO.GPIO4.IO07 */
+#define SC_P_EMMC0_CMD                           10    /* CONN.EMMC0.CMD, CONN.NAND.DQS, LSIO.GPIO4.IO08 */
+#define SC_P_EMMC0_DATA0                         11    /* CONN.EMMC0.DATA0, CONN.NAND.DATA00, LSIO.GPIO4.IO09 */
+#define SC_P_EMMC0_DATA1                         12    /* CONN.EMMC0.DATA1, CONN.NAND.DATA01, LSIO.GPIO4.IO10 */
+#define SC_P_EMMC0_DATA2                         13    /* CONN.EMMC0.DATA2, CONN.NAND.DATA02, LSIO.GPIO4.IO11 */
+#define SC_P_EMMC0_DATA3                         14    /* CONN.EMMC0.DATA3, CONN.NAND.DATA03, LSIO.GPIO4.IO12 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_SD1FIX0       15    /*  */
+#define SC_P_EMMC0_DATA4                         16    /* CONN.EMMC0.DATA4, CONN.NAND.DATA04, CONN.EMMC0.WP, LSIO.GPIO4.IO13 */
+#define SC_P_EMMC0_DATA5                         17    /* CONN.EMMC0.DATA5, CONN.NAND.DATA05, CONN.EMMC0.VSELECT, LSIO.GPIO4.IO14 */
+#define SC_P_EMMC0_DATA6                         18    /* CONN.EMMC0.DATA6, CONN.NAND.DATA06, CONN.MLB.CLK, LSIO.GPIO4.IO15 */
+#define SC_P_EMMC0_DATA7                         19    /* CONN.EMMC0.DATA7, CONN.NAND.DATA07, CONN.MLB.SIG, LSIO.GPIO4.IO16 */
+#define SC_P_EMMC0_STROBE                        20    /* CONN.EMMC0.STROBE, CONN.NAND.CLE, CONN.MLB.DATA, LSIO.GPIO4.IO17 */
+#define SC_P_EMMC0_RESET_B                       21    /* CONN.EMMC0.RESET_B, CONN.NAND.WP_B, LSIO.GPIO4.IO18 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_SD1FIX1       22    /*  */
+#define SC_P_USDHC1_RESET_B                      23    /* CONN.USDHC1.RESET_B, CONN.NAND.RE_N, ADMA.SPI2.SCK, LSIO.GPIO4.IO19 */
+#define SC_P_USDHC1_VSELECT                      24    /* CONN.USDHC1.VSELECT, CONN.NAND.RE_P, ADMA.SPI2.SDO, CONN.NAND.RE_B, LSIO.GPIO4.IO20 */
+#define SC_P_CTL_NAND_RE_P_N                     25    /*  */
+#define SC_P_USDHC1_WP                           26    /* CONN.USDHC1.WP, CONN.NAND.DQS_N, ADMA.SPI2.SDI, LSIO.GPIO4.IO21 */
+#define SC_P_USDHC1_CD_B                         27    /* CONN.USDHC1.CD_B, CONN.NAND.DQS_P, ADMA.SPI2.CS0, CONN.NAND.DQS, LSIO.GPIO4.IO22 */
+#define SC_P_CTL_NAND_DQS_P_N                    28    /*  */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_VSELSEP       29    /*  */
+#define SC_P_USDHC1_CLK                          30    /* CONN.USDHC1.CLK, ADMA.UART3.RX, LSIO.GPIO4.IO23 */
+#define SC_P_USDHC1_CMD                          31    /* CONN.USDHC1.CMD, CONN.NAND.CE0_B, ADMA.MQS.R, LSIO.GPIO4.IO24 */
+#define SC_P_USDHC1_DATA0                        32    /* CONN.USDHC1.DATA0, CONN.NAND.CE1_B, ADMA.MQS.L, LSIO.GPIO4.IO25 */
+#define SC_P_USDHC1_DATA1                        33    /* CONN.USDHC1.DATA1, CONN.NAND.RE_B, ADMA.UART3.TX, LSIO.GPIO4.IO26 */
+#define SC_P_USDHC1_DATA2                        34    /* CONN.USDHC1.DATA2, CONN.NAND.WE_B, ADMA.UART3.CTS_B, LSIO.GPIO4.IO27 */
+#define SC_P_USDHC1_DATA3                        35    /* CONN.USDHC1.DATA3, CONN.NAND.ALE, ADMA.UART3.RTS_B, LSIO.GPIO4.IO28 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_VSEL3         36    /*  */
+#define SC_P_ENET0_RGMII_TXC                     37    /* CONN.ENET0.RGMII_TXC, CONN.ENET0.RCLK50M_OUT, CONN.ENET0.RCLK50M_IN, CONN.NAND.CE1_B, LSIO.GPIO4.IO29 */
+#define SC_P_ENET0_RGMII_TX_CTL                  38    /* CONN.ENET0.RGMII_TX_CTL, CONN.USDHC1.RESET_B, LSIO.GPIO4.IO30 */
+#define SC_P_ENET0_RGMII_TXD0                    39    /* CONN.ENET0.RGMII_TXD0, CONN.USDHC1.VSELECT, LSIO.GPIO4.IO31 */
+#define SC_P_ENET0_RGMII_TXD1                    40    /* CONN.ENET0.RGMII_TXD1, CONN.USDHC1.WP, LSIO.GPIO5.IO00 */
+#define SC_P_ENET0_RGMII_TXD2                    41    /* CONN.ENET0.RGMII_TXD2, CONN.MLB.CLK, CONN.NAND.CE0_B, CONN.USDHC1.CD_B, LSIO.GPIO5.IO01 */
+#define SC_P_ENET0_RGMII_TXD3                    42    /* CONN.ENET0.RGMII_TXD3, CONN.MLB.SIG, CONN.NAND.RE_B, LSIO.GPIO5.IO02 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB0   43    /*  */
+#define SC_P_ENET0_RGMII_RXC                     44    /* CONN.ENET0.RGMII_RXC, CONN.MLB.DATA, CONN.NAND.WE_B, CONN.USDHC1.CLK, LSIO.GPIO5.IO03 */
+#define SC_P_ENET0_RGMII_RX_CTL                  45    /* CONN.ENET0.RGMII_RX_CTL, CONN.USDHC1.CMD, LSIO.GPIO5.IO04 */
+#define SC_P_ENET0_RGMII_RXD0                    46    /* CONN.ENET0.RGMII_RXD0, CONN.USDHC1.DATA0, LSIO.GPIO5.IO05 */
+#define SC_P_ENET0_RGMII_RXD1                    47    /* CONN.ENET0.RGMII_RXD1, CONN.USDHC1.DATA1, LSIO.GPIO5.IO06 */
+#define SC_P_ENET0_RGMII_RXD2                    48    /* CONN.ENET0.RGMII_RXD2, CONN.ENET0.RMII_RX_ER, CONN.USDHC1.DATA2, LSIO.GPIO5.IO07 */
+#define SC_P_ENET0_RGMII_RXD3                    49    /* CONN.ENET0.RGMII_RXD3, CONN.NAND.ALE, CONN.USDHC1.DATA3, LSIO.GPIO5.IO08 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB1   50    /*  */
+#define SC_P_ENET0_REFCLK_125M_25M               51    /* CONN.ENET0.REFCLK_125M_25M, CONN.ENET0.PPS, CONN.ENET1.PPS, LSIO.GPIO5.IO09 */
+#define SC_P_ENET0_MDIO                          52    /* CONN.ENET0.MDIO, ADMA.I2C3.SDA, CONN.ENET1.MDIO, LSIO.GPIO5.IO10 */
+#define SC_P_ENET0_MDC                           53    /* CONN.ENET0.MDC, ADMA.I2C3.SCL, CONN.ENET1.MDC, LSIO.GPIO5.IO11 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_GPIOCT        54    /*  */
+#define SC_P_ESAI0_FSR                           55    /* ADMA.ESAI0.FSR, CONN.ENET1.RCLK50M_OUT, ADMA.LCDIF.D00, CONN.ENET1.RGMII_TXC, CONN.ENET1.RCLK50M_IN */
+#define SC_P_ESAI0_FST                           56    /* ADMA.ESAI0.FST, CONN.MLB.CLK, ADMA.LCDIF.D01, CONN.ENET1.RGMII_TXD2, LSIO.GPIO0.IO01 */
+#define SC_P_ESAI0_SCKR                          57    /* ADMA.ESAI0.SCKR, ADMA.LCDIF.D02, CONN.ENET1.RGMII_TX_CTL, LSIO.GPIO0.IO02 */
+#define SC_P_ESAI0_SCKT                          58    /* ADMA.ESAI0.SCKT, CONN.MLB.SIG, ADMA.LCDIF.D03, CONN.ENET1.RGMII_TXD3, LSIO.GPIO0.IO03 */
+#define SC_P_ESAI0_TX0                           59    /* ADMA.ESAI0.TX0, CONN.MLB.DATA, ADMA.LCDIF.D04, CONN.ENET1.RGMII_RXC, LSIO.GPIO0.IO04 */
+#define SC_P_ESAI0_TX1                           60    /* ADMA.ESAI0.TX1, ADMA.LCDIF.D05, CONN.ENET1.RGMII_RXD3, LSIO.GPIO0.IO05 */
+#define SC_P_ESAI0_TX2_RX3                       61    /* ADMA.ESAI0.TX2_RX3, CONN.ENET1.RMII_RX_ER, ADMA.LCDIF.D06, CONN.ENET1.RGMII_RXD2, LSIO.GPIO0.IO06 */
+#define SC_P_ESAI0_TX3_RX2                       62    /* ADMA.ESAI0.TX3_RX2, ADMA.LCDIF.D07, CONN.ENET1.RGMII_RXD1, LSIO.GPIO0.IO07 */
+#define SC_P_ESAI0_TX4_RX1                       63    /* ADMA.ESAI0.TX4_RX1, ADMA.LCDIF.D08, CONN.ENET1.RGMII_TXD0, LSIO.GPIO0.IO08 */
+#define SC_P_ESAI0_TX5_RX0                       64    /* ADMA.ESAI0.TX5_RX0, ADMA.LCDIF.D09, CONN.ENET1.RGMII_TXD1, LSIO.GPIO0.IO09 */
+#define SC_P_SPDIF0_RX                           65    /* ADMA.SPDIF0.RX, ADMA.MQS.R, ADMA.LCDIF.D10, CONN.ENET1.RGMII_RXD0, LSIO.GPIO0.IO10 */
+#define SC_P_SPDIF0_TX                           66    /* ADMA.SPDIF0.TX, ADMA.MQS.L, ADMA.LCDIF.D11, CONN.ENET1.RGMII_RX_CTL, LSIO.GPIO0.IO11 */
+#define SC_P_SPDIF0_EXT_CLK                      67    /* ADMA.SPDIF0.EXT_CLK, ADMA.LCDIF.D12, CONN.ENET1.REFCLK_125M_25M, LSIO.GPIO0.IO12 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_GPIORHB       68    /*  */
+#define SC_P_SPI3_SCK                            69    /* ADMA.SPI3.SCK, ADMA.LCDIF.D13, LSIO.GPIO0.IO13 */
+#define SC_P_SPI3_SDO                            70    /* ADMA.SPI3.SDO, ADMA.LCDIF.D14, LSIO.GPIO0.IO14 */
+#define SC_P_SPI3_SDI                            71    /* ADMA.SPI3.SDI, ADMA.LCDIF.D15, LSIO.GPIO0.IO15 */
+#define SC_P_SPI3_CS0                            72    /* ADMA.SPI3.CS0, ADMA.ACM.MCLK_OUT1, ADMA.LCDIF.HSYNC, LSIO.GPIO0.IO16 */
+#define SC_P_SPI3_CS1                            73    /* ADMA.SPI3.CS1, ADMA.I2C3.SCL, ADMA.LCDIF.RESET, ADMA.SPI2.CS0, ADMA.LCDIF.D16 */
+#define SC_P_MCLK_IN1                            74    /* ADMA.ACM.MCLK_IN1, ADMA.I2C3.SDA, ADMA.LCDIF.EN, ADMA.SPI2.SCK, ADMA.LCDIF.D17 */
+#define SC_P_MCLK_IN0                            75    /* ADMA.ACM.MCLK_IN0, ADMA.ESAI0.RX_HF_CLK, ADMA.LCDIF.VSYNC, ADMA.SPI2.SDI, LSIO.GPIO0.IO19 */
+#define SC_P_MCLK_OUT0                           76    /* ADMA.ACM.MCLK_OUT0, ADMA.ESAI0.TX_HF_CLK, ADMA.LCDIF.CLK, ADMA.SPI2.SDO, LSIO.GPIO0.IO20 */
+#define SC_P_UART1_TX                            77    /* ADMA.UART1.TX, LSIO.PWM0.OUT, LSIO.GPT0.CAPTURE, LSIO.GPIO0.IO21 */
+#define SC_P_UART1_RX                            78    /* ADMA.UART1.RX, LSIO.PWM1.OUT, LSIO.GPT0.COMPARE, LSIO.GPT1.CLK, LSIO.GPIO0.IO22 */
+#define SC_P_UART1_RTS_B                         79    /* ADMA.UART1.RTS_B, LSIO.PWM2.OUT, ADMA.LCDIF.D16, LSIO.GPT1.CAPTURE, LSIO.GPT0.CLK */
+#define SC_P_UART1_CTS_B                         80    /* ADMA.UART1.CTS_B, LSIO.PWM3.OUT, ADMA.LCDIF.D17, LSIO.GPT1.COMPARE, LSIO.GPIO0.IO24 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_GPIORHK       81    /*  */
+#define SC_P_SAI0_TXD                            82    /* ADMA.SAI0.TXD, ADMA.SAI1.RXC, ADMA.SPI1.SDO, ADMA.LCDIF.D18, LSIO.GPIO0.IO25 */
+#define SC_P_SAI0_TXC                            83    /* ADMA.SAI0.TXC, ADMA.SAI1.TXD, ADMA.SPI1.SDI, ADMA.LCDIF.D19, LSIO.GPIO0.IO26 */
+#define SC_P_SAI0_RXD                            84    /* ADMA.SAI0.RXD, ADMA.SAI1.RXFS, ADMA.SPI1.CS0, ADMA.LCDIF.D20, LSIO.GPIO0.IO27 */
+#define SC_P_SAI0_TXFS                           85    /* ADMA.SAI0.TXFS, ADMA.SPI2.CS1, ADMA.SPI1.SCK, LSIO.GPIO0.IO28 */
+#define SC_P_SAI1_RXD                            86    /* ADMA.SAI1.RXD, ADMA.SAI0.RXFS, ADMA.SPI1.CS1, ADMA.LCDIF.D21, LSIO.GPIO0.IO29 */
+#define SC_P_SAI1_RXC                            87    /* ADMA.SAI1.RXC, ADMA.SAI1.TXC, ADMA.LCDIF.D22, LSIO.GPIO0.IO30 */
+#define SC_P_SAI1_RXFS                           88    /* ADMA.SAI1.RXFS, ADMA.SAI1.TXFS, ADMA.LCDIF.D23, LSIO.GPIO0.IO31 */
+#define SC_P_SPI2_CS0                            89    /* ADMA.SPI2.CS0, LSIO.GPIO1.IO00 */
+#define SC_P_SPI2_SDO                            90    /* ADMA.SPI2.SDO, LSIO.GPIO1.IO01 */
+#define SC_P_SPI2_SDI                            91    /* ADMA.SPI2.SDI, LSIO.GPIO1.IO02 */
+#define SC_P_SPI2_SCK                            92    /* ADMA.SPI2.SCK, LSIO.GPIO1.IO03 */
+#define SC_P_SPI0_SCK                            93    /* ADMA.SPI0.SCK, ADMA.SAI0.TXC, M40.I2C0.SCL, M40.GPIO0.IO00, LSIO.GPIO1.IO04 */
+#define SC_P_SPI0_SDI                            94    /* ADMA.SPI0.SDI, ADMA.SAI0.TXD, M40.TPM0.CH0, M40.GPIO0.IO02, LSIO.GPIO1.IO05 */
+#define SC_P_SPI0_SDO                            95    /* ADMA.SPI0.SDO, ADMA.SAI0.TXFS, M40.I2C0.SDA, M40.GPIO0.IO01, LSIO.GPIO1.IO06 */
+#define SC_P_SPI0_CS1                            96    /* ADMA.SPI0.CS1, ADMA.SAI0.RXC, ADMA.SAI1.TXD, ADMA.LCD_PWM0.OUT, LSIO.GPIO1.IO07 */
+#define SC_P_SPI0_CS0                            97    /* ADMA.SPI0.CS0, ADMA.SAI0.RXD, M40.TPM0.CH1, M40.GPIO0.IO03, LSIO.GPIO1.IO08 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_GPIORHT       98    /*  */
+#define SC_P_ADC_IN1                             99    /* ADMA.ADC.IN1, M40.I2C0.SDA, M40.GPIO0.IO01, LSIO.GPIO1.IO09 */
+#define SC_P_ADC_IN0                             100   /* ADMA.ADC.IN0, M40.I2C0.SCL, M40.GPIO0.IO00, LSIO.GPIO1.IO10 */
+#define SC_P_ADC_IN3                             101   /* ADMA.ADC.IN3, M40.UART0.TX, M40.GPIO0.IO03, ADMA.ACM.MCLK_OUT0, LSIO.GPIO1.IO11 */
+#define SC_P_ADC_IN2                             102   /* ADMA.ADC.IN2, M40.UART0.RX, M40.GPIO0.IO02, ADMA.ACM.MCLK_IN0, LSIO.GPIO1.IO12 */
+#define SC_P_ADC_IN5                             103   /* ADMA.ADC.IN5, M40.TPM0.CH1, M40.GPIO0.IO05, LSIO.GPIO1.IO13 */
+#define SC_P_ADC_IN4                             104   /* ADMA.ADC.IN4, M40.TPM0.CH0, M40.GPIO0.IO04, LSIO.GPIO1.IO14 */
+#define SC_P_FLEXCAN0_RX                         105   /* ADMA.FLEXCAN0.RX, ADMA.SAI2.RXC, ADMA.UART0.RTS_B, ADMA.SAI1.TXC, LSIO.GPIO1.IO15 */
+#define SC_P_FLEXCAN0_TX                         106   /* ADMA.FLEXCAN0.TX, ADMA.SAI2.RXD, ADMA.UART0.CTS_B, ADMA.SAI1.TXFS, LSIO.GPIO1.IO16 */
+#define SC_P_FLEXCAN1_RX                         107   /* ADMA.FLEXCAN1.RX, ADMA.SAI2.RXFS, ADMA.FTM.CH2, ADMA.SAI1.TXD, LSIO.GPIO1.IO17 */
+#define SC_P_FLEXCAN1_TX                         108   /* ADMA.FLEXCAN1.TX, ADMA.SAI3.RXC, ADMA.DMA0.REQ_IN0, ADMA.SAI1.RXD, LSIO.GPIO1.IO18 */
+#define SC_P_FLEXCAN2_RX                         109   /* ADMA.FLEXCAN2.RX, ADMA.SAI3.RXD, ADMA.UART3.RX, ADMA.SAI1.RXFS, LSIO.GPIO1.IO19 */
+#define SC_P_FLEXCAN2_TX                         110   /* ADMA.FLEXCAN2.TX, ADMA.SAI3.RXFS, ADMA.UART3.TX, ADMA.SAI1.RXC, LSIO.GPIO1.IO20 */
+#define SC_P_UART0_RX                            111   /* ADMA.UART0.RX, ADMA.MQS.R, ADMA.FLEXCAN0.RX, SCU.UART0.RX, LSIO.GPIO1.IO21 */
+#define SC_P_UART0_TX                            112   /* ADMA.UART0.TX, ADMA.MQS.L, ADMA.FLEXCAN0.TX, SCU.UART0.TX, LSIO.GPIO1.IO22 */
+#define SC_P_UART2_TX                            113   /* ADMA.UART2.TX, ADMA.FTM.CH1, ADMA.FLEXCAN1.TX, LSIO.GPIO1.IO23 */
+#define SC_P_UART2_RX                            114   /* ADMA.UART2.RX, ADMA.FTM.CH0, ADMA.FLEXCAN1.RX, LSIO.GPIO1.IO24 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_GPIOLH        115   /*  */
+#define SC_P_MIPI_DSI0_I2C0_SCL                  116   /* MIPI_DSI0.I2C0.SCL, MIPI_DSI1.GPIO0.IO02, LSIO.GPIO1.IO25 */
+#define SC_P_MIPI_DSI0_I2C0_SDA                  117   /* MIPI_DSI0.I2C0.SDA, MIPI_DSI1.GPIO0.IO03, LSIO.GPIO1.IO26 */
+#define SC_P_MIPI_DSI0_GPIO0_00                  118   /* MIPI_DSI0.GPIO0.IO00, ADMA.I2C1.SCL, MIPI_DSI0.PWM0.OUT, LSIO.GPIO1.IO27 */
+#define SC_P_MIPI_DSI0_GPIO0_01                  119   /* MIPI_DSI0.GPIO0.IO01, ADMA.I2C1.SDA, LSIO.GPIO1.IO28 */
+#define SC_P_MIPI_DSI1_I2C0_SCL                  120   /* MIPI_DSI1.I2C0.SCL, MIPI_DSI0.GPIO0.IO02, LSIO.GPIO1.IO29 */
+#define SC_P_MIPI_DSI1_I2C0_SDA                  121   /* MIPI_DSI1.I2C0.SDA, MIPI_DSI0.GPIO0.IO03, LSIO.GPIO1.IO30 */
+#define SC_P_MIPI_DSI1_GPIO0_00                  122   /* MIPI_DSI1.GPIO0.IO00, ADMA.I2C2.SCL, MIPI_DSI1.PWM0.OUT, LSIO.GPIO1.IO31 */
+#define SC_P_MIPI_DSI1_GPIO0_01                  123   /* MIPI_DSI1.GPIO0.IO01, ADMA.I2C2.SDA, LSIO.GPIO2.IO00 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_MIPIDSIGPIO   124   /*  */
+#define SC_P_JTAG_TRST_B                         125   /* SCU.JTAG.TRST_B, SCU.WDOG0.WDOG_OUT */
+#define SC_P_PMIC_I2C_SCL                        126   /* SCU.PMIC_I2C.SCL, SCU.GPIO0.IOXX_PMIC_A35_ON, LSIO.GPIO2.IO01 */
+#define SC_P_PMIC_I2C_SDA                        127   /* SCU.PMIC_I2C.SDA, SCU.GPIO0.IOXX_PMIC_GPU_ON, LSIO.GPIO2.IO02 */
+#define SC_P_PMIC_INT_B                          128   /* SCU.DSC.PMIC_INT_B */
+#define SC_P_SCU_GPIO0_00                        129   /* SCU.GPIO0.IO00, SCU.UART0.RX, M40.UART0.RX, ADMA.UART3.RX, LSIO.GPIO2.IO03 */
+#define SC_P_SCU_GPIO0_01                        130   /* SCU.GPIO0.IO01, SCU.UART0.TX, M40.UART0.TX, ADMA.UART3.TX, SCU.WDOG0.WDOG_OUT */
+#define SC_P_SCU_PMIC_STANDBY                    131   /* SCU.DSC.PMIC_STANDBY */
+#define SC_P_SCU_BOOT_MODE0                      132   /* SCU.DSC.BOOT_MODE0 */
+#define SC_P_SCU_BOOT_MODE1                      133   /* SCU.DSC.BOOT_MODE1 */
+#define SC_P_SCU_BOOT_MODE2                      134   /* SCU.DSC.BOOT_MODE2, SCU.PMIC_I2C.SDA */
+#define SC_P_SCU_BOOT_MODE3                      135   /* SCU.DSC.BOOT_MODE3, SCU.PMIC_I2C.SCL, SCU.DSC.RTC_CLOCK_OUTPUT_32K */
+#define SC_P_CSI_D00                             136   /* CI_PI.D02, ADMA.SAI0.RXC */
+#define SC_P_CSI_D01                             137   /* CI_PI.D03, ADMA.SAI0.RXD */
+#define SC_P_CSI_D02                             138   /* CI_PI.D04, ADMA.SAI0.RXFS */
+#define SC_P_CSI_D03                             139   /* CI_PI.D05, ADMA.SAI2.RXC */
+#define SC_P_CSI_D04                             140   /* CI_PI.D06, ADMA.SAI2.RXD */
+#define SC_P_CSI_D05                             141   /* CI_PI.D07, ADMA.SAI2.RXFS */
+#define SC_P_CSI_D06                             142   /* CI_PI.D08, ADMA.SAI3.RXC */
+#define SC_P_CSI_D07                             143   /* CI_PI.D09, ADMA.SAI3.RXD */
+#define SC_P_CSI_HSYNC                           144   /* CI_PI.HSYNC, CI_PI.D00, ADMA.SAI3.RXFS */
+#define SC_P_CSI_VSYNC                           145   /* CI_PI.VSYNC, CI_PI.D01 */
+#define SC_P_CSI_PCLK                            146   /* CI_PI.PCLK, MIPI_CSI0.I2C0.SCL, ADMA.SPI1.SCK, LSIO.GPIO3.IO00 */
+#define SC_P_CSI_MCLK                            147   /* CI_PI.MCLK, MIPI_CSI0.I2C0.SDA, ADMA.SPI1.SDO, LSIO.GPIO3.IO01 */
+#define SC_P_CSI_EN                              148   /* CI_PI.EN, CI_PI.I2C.SCL, ADMA.I2C3.SCL, ADMA.SPI1.SDI, LSIO.GPIO3.IO02 */
+#define SC_P_CSI_RESET                           149   /* CI_PI.RESET, CI_PI.I2C.SDA, ADMA.I2C3.SDA, ADMA.SPI1.CS0, LSIO.GPIO3.IO03 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_GPIORHD       150   /*  */
+#define SC_P_MIPI_CSI0_MCLK_OUT                  151   /* MIPI_CSI0.ACM.MCLK_OUT, LSIO.GPIO3.IO04 */
+#define SC_P_MIPI_CSI0_I2C0_SCL                  152   /* MIPI_CSI0.I2C0.SCL, MIPI_CSI0.GPIO0.IO02, LSIO.GPIO3.IO05 */
+#define SC_P_MIPI_CSI0_I2C0_SDA                  153   /* MIPI_CSI0.I2C0.SDA, MIPI_CSI0.GPIO0.IO03, LSIO.GPIO3.IO06 */
+#define SC_P_MIPI_CSI0_GPIO0_01                  154   /* MIPI_CSI0.GPIO0.IO01, ADMA.I2C0.SDA, LSIO.GPIO3.IO07 */
+#define SC_P_MIPI_CSI0_GPIO0_00                  155   /* MIPI_CSI0.GPIO0.IO00, ADMA.I2C0.SCL, LSIO.GPIO3.IO08 */
+#define SC_P_QSPI0A_DATA0                        156   /* LSIO.QSPI0A.DATA0, LSIO.GPIO3.IO09 */
+#define SC_P_QSPI0A_DATA1                        157   /* LSIO.QSPI0A.DATA1, LSIO.GPIO3.IO10 */
+#define SC_P_QSPI0A_DATA2                        158   /* LSIO.QSPI0A.DATA2, LSIO.GPIO3.IO11 */
+#define SC_P_QSPI0A_DATA3                        159   /* LSIO.QSPI0A.DATA3, LSIO.GPIO3.IO12 */
+#define SC_P_QSPI0A_DQS                          160   /* LSIO.QSPI0A.DQS, LSIO.GPIO3.IO13 */
+#define SC_P_QSPI0A_SS0_B                        161   /* LSIO.QSPI0A.SS0_B, LSIO.GPIO3.IO14 */
+#define SC_P_QSPI0A_SS1_B                        162   /* LSIO.QSPI0A.SS1_B, LSIO.GPIO3.IO15 */
+#define SC_P_QSPI0A_SCLK                         163   /* LSIO.QSPI0A.SCLK, LSIO.GPIO3.IO16 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_QSPI0A        164   /*  */
+#define SC_P_QSPI0B_SCLK                         165   /* LSIO.QSPI0B.SCLK, LSIO.QSPI1A.SCLK, LSIO.KPP0.COL0, LSIO.GPIO3.IO17 */
+#define SC_P_QSPI0B_DATA0                        166   /* LSIO.QSPI0B.DATA0, LSIO.QSPI1A.DATA0, LSIO.KPP0.COL1, LSIO.GPIO3.IO18 */
+#define SC_P_QSPI0B_DATA1                        167   /* LSIO.QSPI0B.DATA1, LSIO.QSPI1A.DATA1, LSIO.KPP0.COL2, LSIO.GPIO3.IO19 */
+#define SC_P_QSPI0B_DATA2                        168   /* LSIO.QSPI0B.DATA2, LSIO.QSPI1A.DATA2, LSIO.KPP0.COL3, LSIO.GPIO3.IO20 */
+#define SC_P_QSPI0B_DATA3                        169   /* LSIO.QSPI0B.DATA3, LSIO.QSPI1A.DATA3, LSIO.KPP0.ROW0, LSIO.GPIO3.IO21 */
+#define SC_P_QSPI0B_DQS                          170   /* LSIO.QSPI0B.DQS, LSIO.QSPI1A.DQS, LSIO.KPP0.ROW1, LSIO.GPIO3.IO22 */
+#define SC_P_QSPI0B_SS0_B                        171   /* LSIO.QSPI0B.SS0_B, LSIO.QSPI1A.SS0_B, LSIO.KPP0.ROW2, LSIO.GPIO3.IO23 */
+#define SC_P_QSPI0B_SS1_B                        172   /* LSIO.QSPI0B.SS1_B, LSIO.QSPI1A.SS1_B, LSIO.KPP0.ROW3, LSIO.GPIO3.IO24 */
+#define SC_P_COMP_CTL_GPIO_1V8_3V3_QSPI0B        173   /*  */
+/*@}*/
+
+#endif                         /* SC_PADS_H */
diff --git a/plat/imx/imx8qx/imx8qx_bl31_setup.c b/plat/imx/imx8qx/imx8qx_bl31_setup.c
new file mode 100644 (file)
index 0000000..8dac943
--- /dev/null
@@ -0,0 +1,342 @@
+/*
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <arch_helpers.h>
+#include <assert.h>
+#include <bl_common.h>
+#include <cci.h>
+#include <console.h>
+#include <context.h>
+#include <context_mgmt.h>
+#include <debug.h>
+#include <imx8qx_pads.h>
+#include <imx8_iomux.h>
+#include <imx8_lpuart.h>
+#include <mmio.h>
+#include <platform.h>
+#include <platform_def.h>
+#include <plat_imx8.h>
+#include <sci/sci.h>
+#include <sec_rsrc.h>
+#include <stdbool.h>
+#include <xlat_tables.h>
+
+IMPORT_SYM(unsigned long, __COHERENT_RAM_START__, BL31_COHERENT_RAM_START);
+IMPORT_SYM(unsigned long, __COHERENT_RAM_END__, BL31_COHERENT_RAM_END);
+IMPORT_SYM(unsigned long, __RO_START__, BL31_RO_START);
+IMPORT_SYM(unsigned long, __RO_END__, BL31_RO_END);
+IMPORT_SYM(unsigned long, __RW_START__, BL31_RW_START);
+IMPORT_SYM(unsigned long, __RW_END__, BL31_RW_END);
+
+static entry_point_info_t bl32_image_ep_info;
+static entry_point_info_t bl33_image_ep_info;
+
+#define UART_PAD_CTRL  (PADRING_IFMUX_EN_MASK | PADRING_GP_EN_MASK | \
+                       (SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | \
+                       (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \
+                       (SC_PAD_28FDSOI_DSE_DV_LOW << PADRING_DSE_SHIFT) | \
+                       (SC_PAD_28FDSOI_PS_PD << PADRING_PULL_SHIFT))
+
+static const mmap_region_t imx_mmap[] = {
+       MAP_REGION_FLAT(IMX_BOOT_UART_BASE, IMX_BOOT_UART_SIZE, MT_DEVICE | MT_RW),
+       MAP_REGION_FLAT(SC_IPC_BASE, SC_IPC_SIZE, MT_DEVICE | MT_RW),
+       MAP_REGION_FLAT(PLAT_GICD_BASE, PLAT_GICD_SIZE, MT_DEVICE | MT_RW),
+       MAP_REGION_FLAT(PLAT_GICR_BASE, PLAT_GICR_SIZE, MT_DEVICE | MT_RW),
+       {0}
+};
+
+static uint32_t get_spsr_for_bl33_entry(void)
+{
+       unsigned long el_status;
+       unsigned long mode;
+       uint32_t spsr;
+
+       /* figure out what mode we enter the non-secure world */
+       el_status = read_id_aa64pfr0_el1() >> ID_AA64PFR0_EL2_SHIFT;
+       el_status &= ID_AA64PFR0_ELX_MASK;
+
+       mode = (el_status) ? MODE_EL2 : MODE_EL1;
+
+       spsr = SPSR_64(mode, MODE_SP_ELX, DISABLE_ALL_EXCEPTIONS);
+       return spsr;
+}
+
+#if DEBUG_CONSOLE_A35
+static void lpuart32_serial_setbrg(unsigned int base, int baudrate)
+{
+       unsigned int sbr, osr, baud_diff, tmp_osr, tmp_sbr;
+       unsigned int diff1, diff2, tmp, rate;
+
+       if (baudrate == 0)
+               panic();
+
+       sc_pm_get_clock_rate(ipc_handle, SC_R_UART_0, 2, &rate);
+
+       baud_diff = baudrate;
+       osr = 0;
+       sbr = 0;
+       for (tmp_osr = 4; tmp_osr <= 32; tmp_osr++) {
+               tmp_sbr = (rate / (baudrate * tmp_osr));
+               if (tmp_sbr == 0)
+                       tmp_sbr = 1;
+
+               /* calculate difference in actual baud w/ current values */
+               diff1 = rate / (tmp_osr * tmp_sbr) - baudrate;
+               diff2 = rate / (tmp_osr * (tmp_sbr + 1));
+
+               /* select best values between sbr and sbr+1 */
+               if (diff1 > (baudrate - diff2)) {
+                       diff1 = baudrate - diff2;
+                       tmp_sbr++;
+               }
+
+               if (diff1 <= baud_diff) {
+                       baud_diff = diff1;
+                       osr = tmp_osr;
+                       sbr = tmp_sbr;
+               }
+       }
+
+       tmp = mmio_read_32(IMX_BOOT_UART_BASE + BAUD);
+
+       if ((osr > 3) && (osr < 8))
+               tmp |= LPUART_BAUD_BOTHEDGE_MASK;
+
+       tmp &= ~LPUART_BAUD_OSR_MASK;
+       tmp |= LPUART_BAUD_OSR(osr - 1);
+       tmp &= ~LPUART_BAUD_SBR_MASK;
+       tmp |= LPUART_BAUD_SBR(sbr);
+
+       /* explicitly disable 10 bit mode & set 1 stop bit */
+       tmp &= ~(LPUART_BAUD_M10_MASK | LPUART_BAUD_SBNS_MASK);
+
+       mmio_write_32(IMX_BOOT_UART_BASE + BAUD, tmp);
+}
+
+static int lpuart32_serial_init(unsigned int base)
+{
+       unsigned int tmp;
+
+       /* disable TX & RX before enabling clocks */
+       tmp = mmio_read_32(IMX_BOOT_UART_BASE + CTRL);
+       tmp &= ~(CTRL_TE | CTRL_RE);
+       mmio_write_32(IMX_BOOT_UART_BASE + CTRL, tmp);
+
+       mmio_write_32(IMX_BOOT_UART_BASE + MODIR, 0);
+       mmio_write_32(IMX_BOOT_UART_BASE + FIFO, ~(FIFO_TXFE | FIFO_RXFE));
+
+       mmio_write_32(IMX_BOOT_UART_BASE + MATCH, 0);
+
+       /* provide data bits, parity, stop bit, etc */
+       lpuart32_serial_setbrg(base, IMX_BOOT_UART_BAUDRATE);
+
+       /* eight data bits no parity bit */
+       tmp = mmio_read_32(IMX_BOOT_UART_BASE + CTRL);
+       tmp &= ~(LPUART_CTRL_PE_MASK | LPUART_CTRL_PT_MASK | LPUART_CTRL_M_MASK);
+       mmio_write_32(IMX_BOOT_UART_BASE + CTRL, tmp);
+
+       mmio_write_32(IMX_BOOT_UART_BASE + CTRL, CTRL_RE | CTRL_TE);
+
+       mmio_write_32(IMX_BOOT_UART_BASE + DATA, 0x55);
+       mmio_write_32(IMX_BOOT_UART_BASE + DATA, 0x55);
+       mmio_write_32(IMX_BOOT_UART_BASE + DATA, 0x0A);
+
+       return 0;
+}
+#endif
+
+void imx8_partition_resources(void)
+{
+       sc_rm_pt_t secure_part, os_part;
+       sc_rm_mr_t mr, mr_record = 64;
+       sc_faddr_t start, end;
+       sc_err_t err;
+       bool owned;
+       int i;
+
+       err = sc_rm_get_partition(ipc_handle, &secure_part);
+       if (err)
+               ERROR("sc_rm_get_partition failed: %u\n", err);
+
+       err = sc_rm_partition_alloc(ipc_handle, &os_part, false, false,
+               false, false, false);
+       if (err)
+               ERROR("sc_rm_partition_alloc failed: %u\n", err);
+
+       err = sc_rm_set_parent(ipc_handle, os_part, secure_part);
+       if (err)
+               ERROR("sc_rm_set_parent: %u\n", err);
+
+       /* set secure resources to NOT-movable */
+       for (i = 0; i < (ARRAY_SIZE(secure_rsrcs)); i++) {
+               err = sc_rm_set_resource_movable(ipc_handle,
+                        secure_rsrcs[i], secure_rsrcs[i], false);
+               if (err)
+                       ERROR("sc_rm_set_resource_movable: rsrc %u, ret %u\n",
+                               secure_rsrcs[i], err);
+       }
+
+       /* move all movable resources and pins to non-secure partition */
+       err = sc_rm_move_all(ipc_handle, secure_part, os_part, true, true);
+       if (err)
+               ERROR("sc_rm_move_all: %u\n", err);
+
+       /* iterate through peripherals to give NS OS part access */
+       for (i = 0; i < ARRAY_SIZE(ns_access_allowed); i++) {
+               err = sc_rm_set_peripheral_permissions(ipc_handle,
+                       ns_access_allowed[i], os_part, SC_RM_PERM_FULL);
+               if (err)
+                       ERROR("sc_rm_set_peripheral_permissions: rsrc %u, \
+                               ret %u\n", ns_access_allowed[i], err);
+       }
+
+       /*
+        * sc_rm_set_peripheral_permissions
+        * sc_rm_set_memreg_permissions
+        * sc_rm_set_pin_movable
+        */
+       for (mr = 0; mr < 64; mr++) {
+               owned = sc_rm_is_memreg_owned(ipc_handle, mr);
+               if (owned) {
+                       err = sc_rm_get_memreg_info(ipc_handle, mr, &start, &end);
+                       if (err)
+                               ERROR("Memreg get info failed, %u\n", mr);
+
+                       NOTICE("Memreg %u 0x%llx -- 0x%llx\n", mr, start, end);
+                       if (BL31_BASE >= start && (BL31_LIMIT - 1) <= end) {
+                               mr_record = mr; /* Record the mr for ATF running */
+                       } else {
+                               err = sc_rm_assign_memreg(ipc_handle, os_part, mr);
+                               if (err)
+                                       ERROR("Memreg assign failed, 0x%llx -- 0x%llx, \
+                                               err %d\n", start, end, err);
+                       }
+               }
+       }
+
+       if (mr_record != 64) {
+               err = sc_rm_get_memreg_info(ipc_handle, mr_record, &start, &end);
+               if (err)
+                       ERROR("Memreg get info failed, %u\n", mr_record);
+               if ((BL31_LIMIT - 1) < end) {
+                       err = sc_rm_memreg_alloc(ipc_handle, &mr, BL31_LIMIT, end);
+                       if (err)
+                               ERROR("sc_rm_memreg_alloc failed, 0x%llx -- 0x%llx\n",
+                                       (sc_faddr_t)BL31_LIMIT, end);
+                       err = sc_rm_assign_memreg(ipc_handle, os_part, mr);
+                       if (err)
+                               ERROR("Memreg assign failed, 0x%llx -- 0x%llx\n",
+                                       (sc_faddr_t)BL31_LIMIT, end);
+               }
+
+               if (start < (BL31_BASE - 1)) {
+                       err = sc_rm_memreg_alloc(ipc_handle, &mr, start, BL31_BASE - 1);
+                       if (err)
+                               ERROR("sc_rm_memreg_alloc failed, 0x%llx -- 0x%llx\n",
+                                       start, (sc_faddr_t)BL31_BASE - 1);
+                       err = sc_rm_assign_memreg(ipc_handle, os_part, mr);
+                       if (err)
+                               ERROR("Memreg assign failed, 0x%llx -- 0x%llx\n",
+                                       start, (sc_faddr_t)BL31_BASE - 1);
+               }
+       }
+
+       if (err)
+               NOTICE("Partitioning Failed\n");
+       else
+               NOTICE("Non-secure Partitioning Succeeded\n");
+}
+
+void bl31_early_platform_setup(bl31_params_t *from_bl2,
+                               void *plat_params_from_bl2)
+{
+#if DEBUG_CONSOLE
+       static console_lpuart_t console;
+#endif
+       if (sc_ipc_open(&ipc_handle, SC_IPC_BASE) != SC_ERR_NONE)
+               panic();
+
+#if DEBUG_CONSOLE_A35
+       sc_pm_set_resource_power_mode(ipc_handle, SC_R_UART_0, SC_PM_PW_MODE_ON);
+       sc_pm_clock_rate_t rate = 80000000;
+       sc_pm_set_clock_rate(ipc_handle, SC_R_UART_0, 2, &rate);
+       sc_pm_clock_enable(ipc_handle, SC_R_UART_0, 2, true, false);
+
+       /* Configure UART pads */
+       sc_pad_set(ipc_handle, SC_P_UART0_RX, UART_PAD_CTRL);
+       sc_pad_set(ipc_handle, SC_P_UART0_TX, UART_PAD_CTRL);
+       lpuart32_serial_init(IMX_BOOT_UART_BASE);
+#endif
+
+#if DEBUG_CONSOLE
+       console_lpuart_register(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ,
+                    IMX_CONSOLE_BAUDRATE, &console);
+#endif
+       /* Turn on MU1 for non-secure OS/Hypervisor */
+       sc_pm_set_resource_power_mode(ipc_handle, SC_R_MU_1A, SC_PM_PW_MODE_ON);
+
+       /*
+        * create new partition for non-secure OS/Hypervisor
+        * uses global structs defined in sec_rsrc.h
+        */
+       imx8_partition_resources();
+
+       bl33_image_ep_info.pc = PLAT_NS_IMAGE_OFFSET;
+       bl33_image_ep_info.spsr = get_spsr_for_bl33_entry();
+       SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE);
+}
+
+void bl31_plat_arch_setup(void)
+{
+       unsigned long ro_start = BL31_RO_START;
+       unsigned long ro_size = BL31_RO_END - BL31_RO_START;
+       unsigned long rw_start = BL31_RW_START;
+       unsigned long rw_size = BL31_RW_END - BL31_RW_START;
+#if USE_COHERENT_MEM
+       unsigned long coh_start = BL31_COHERENT_RAM_START;
+       unsigned long coh_size = BL31_COHERENT_RAM_END - BL31_COHERENT_RAM_START;
+#endif
+
+       mmap_add_region(ro_start, ro_start, ro_size,
+               MT_RO | MT_MEMORY | MT_SECURE);
+       mmap_add_region(rw_start, rw_start, rw_size,
+               MT_RW | MT_MEMORY | MT_SECURE);
+       mmap_add(imx_mmap);
+
+#if USE_COHERENT_MEM
+       mmap_add_region(coh_start, coh_start, coh_size,
+                       MT_DEVICE | MT_RW | MT_SECURE);
+#endif
+
+       init_xlat_tables();
+       enable_mmu_el3(0);
+}
+
+void bl31_platform_setup(void)
+{
+       plat_gic_driver_init();
+       plat_gic_init();
+}
+
+entry_point_info_t *bl31_plat_get_next_image_ep_info(unsigned int type)
+{
+       if (type == NON_SECURE)
+               return &bl33_image_ep_info;
+       if (type == SECURE)
+               return &bl32_image_ep_info;
+
+       return NULL;
+}
+
+unsigned int plat_get_syscnt_freq2(void)
+{
+       return COUNTER_FREQUENCY;
+}
+
+void bl31_plat_runtime_setup(void)
+{
+       return;
+}
diff --git a/plat/imx/imx8qx/imx8qx_psci.c b/plat/imx/imx8qx/imx8qx_psci.c
new file mode 100644 (file)
index 0000000..47233dc
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <debug.h>
+#include <gicv3.h>
+#include <mmio.h>
+#include <plat_imx8.h>
+#include <psci.h>
+#include <sci/sci.h>
+#include <stdbool.h>
+
+const static int ap_core_index[PLATFORM_CORE_COUNT] = {
+       SC_R_A35_0, SC_R_A35_1, SC_R_A35_2, SC_R_A35_3
+};
+
+plat_local_state_t plat_get_target_pwr_state(unsigned int lvl,
+                                            const plat_local_state_t *target_state,
+                                            unsigned int ncpu)
+{
+       return 0;
+}
+
+int imx_pwr_domain_on(u_register_t mpidr)
+{
+       int ret = PSCI_E_SUCCESS;
+       unsigned int cpu_id;
+
+       cpu_id = MPIDR_AFFLVL0_VAL(mpidr);
+
+       tf_printf("imx_pwr_domain_on cpu_id %d\n", cpu_id);
+
+       if (sc_pm_set_resource_power_mode(ipc_handle, ap_core_index[cpu_id],
+           SC_PM_PW_MODE_ON) != SC_ERR_NONE) {
+               ERROR("core %d power on failed!\n", cpu_id);
+               ret = PSCI_E_INTERN_FAIL;
+       }
+
+       if (sc_pm_cpu_start(ipc_handle, ap_core_index[cpu_id],
+           true, BL31_BASE) != SC_ERR_NONE) {
+               ERROR("boot core %d failed!\n", cpu_id);
+               ret = PSCI_E_INTERN_FAIL;
+       }
+
+       return ret;
+}
+
+void imx_pwr_domain_on_finish(const psci_power_state_t *target_state)
+{
+       plat_gic_pcpu_init();
+       plat_gic_cpuif_enable();
+}
+
+int imx_validate_ns_entrypoint(uintptr_t ns_entrypoint)
+{
+       return PSCI_E_SUCCESS;
+}
+
+static const plat_psci_ops_t imx_plat_psci_ops = {
+       .pwr_domain_on = imx_pwr_domain_on,
+       .pwr_domain_on_finish = imx_pwr_domain_on_finish,
+       .validate_ns_entrypoint = imx_validate_ns_entrypoint,
+};
+
+int plat_setup_psci_ops(uintptr_t sec_entrypoint,
+                       const plat_psci_ops_t **psci_ops)
+{
+       imx_mailbox_init(sec_entrypoint);
+       *psci_ops = &imx_plat_psci_ops;
+
+       return 0;
+}
diff --git a/plat/imx/imx8qx/include/platform_def.h b/plat/imx/imx8qx/include/platform_def.h
new file mode 100644 (file)
index 0000000..2cd1400
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __PLATFORM_DEF_H__
+#define __PLATFORM_DEF_H__
+
+#define PLATFORM_LINKER_FORMAT         "elf64-littleaarch64"
+#define PLATFORM_LINKER_ARCH           aarch64
+
+#define PLATFORM_STACK_SIZE            0x400
+#define CACHE_WRITEBACK_GRANULE                64
+
+#define PLAT_PRIMARY_CPU               0x0
+#define PLATFORM_MAX_CPU_PER_CLUSTER   4
+#define PLATFORM_CLUSTER_COUNT         1
+#define PLATFORM_CORE_COUNT            4
+
+#define PWR_DOMAIN_AT_MAX_LVL           1
+#define PLAT_MAX_PWR_LVL                2
+#define PLAT_MAX_OFF_STATE              2
+#define PLAT_MAX_RET_STATE              1
+
+#define BL31_BASE                      0x80000000
+#define BL31_LIMIT                     0x80020000
+
+#define PLAT_VIRT_ADDR_SPACE_SIZE      (1ull << 32)
+#define PLAT_PHY_ADDR_SPACE_SIZE       (1ull << 32)
+
+#define MAX_XLAT_TABLES                        8
+#define MAX_MMAP_REGIONS               8
+
+#define PLAT_GICD_BASE                 0x51a00000
+#define PLAT_GICD_SIZE                 0x10000
+#define PLAT_GICR_BASE                 0x51b00000
+#define PLAT_GICR_SIZE                 0xc0000
+#define IMX_BOOT_UART_BASE             0x5a060000
+#define IMX_BOOT_UART_SIZE             0x1000
+#define IMX_BOOT_UART_BAUDRATE         115200
+#define IMX_BOOT_UART_CLK_IN_HZ                24000000
+#define PLAT_CRASH_UART_BASE           IMX_BOOT_UART_BASE
+#define PLAT__CRASH_UART_CLK_IN_HZ     24000000
+#define IMX_CONSOLE_BAUDRATE           115200
+#define SC_IPC_BASE                    0x5d1b0000
+#define SC_IPC_SIZE                    0x10000
+
+#define COUNTER_FREQUENCY              8000000
+
+/* non-secure u-boot base */
+#define PLAT_NS_IMAGE_OFFSET           0x80020000
+
+#define DEBUG_CONSOLE                  0
+#define DEBUG_CONSOLE_A35              0
+#define PLAT_IMX8QX                    1
+
+#endif /* __PLATFORM_DEF_H__ */
diff --git a/plat/imx/imx8qx/include/sec_rsrc.h b/plat/imx/imx8qx/include/sec_rsrc.h
new file mode 100644 (file)
index 0000000..37c9f66
--- /dev/null
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/* resources that are going to stay in secure partition */
+sc_rsrc_t secure_rsrcs[] = {
+       SC_R_MU_0A,
+       SC_R_A35,
+       SC_R_A35_0,
+       SC_R_A35_1,
+       SC_R_A35_2,
+       SC_R_A35_3,
+       SC_R_GIC,
+       SC_R_SYSTEM,
+       SC_R_IRQSTR_SCU2
+};
+
+/* resources that have register access for non-secure domain */
+sc_rsrc_t ns_access_allowed[] = {
+       SC_R_GIC,
+};
diff --git a/plat/imx/imx8qx/platform.mk b/plat/imx/imx8qx/platform.mk
new file mode 100644 (file)
index 0000000..c16ce6e
--- /dev/null
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+PLAT_INCLUDES          :=      -Iplat/imx/imx8qx/include               \
+                               -Iplat/imx/common/include               \
+
+IMX_GIC_SOURCES        :=              drivers/arm/gic/v3/gicv3_helpers.c      \
+                               drivers/arm/gic/v3/arm_gicv3_common.c   \
+                               drivers/arm/gic/v3/gic500.c             \
+                               drivers/arm/gic/v3/gicv3_main.c         \
+                               drivers/arm/gic/common/gic_common.c     \
+                               plat/common/plat_gicv3.c                \
+                               plat/imx/common/plat_imx8_gic.c
+
+BL31_SOURCES           +=      plat/imx/common/lpuart_console.S        \
+                               plat/imx/common/imx8_helpers.S          \
+                               plat/imx/imx8qx/imx8qx_bl31_setup.c     \
+                               plat/imx/imx8qx/imx8qx_psci.c           \
+                               plat/imx/common/imx8_topology.c         \
+                               lib/xlat_tables/xlat_tables_common.c    \
+                               lib/xlat_tables/aarch64/xlat_tables.c   \
+                               lib/cpus/aarch64/cortex_a35.S           \
+                               drivers/console/aarch64/console.S       \
+                               ${IMX_GIC_SOURCES}                      \
+
+include plat/imx/common/sci/sci_api.mk
+
+ENABLE_PLAT_COMPAT     :=      0
+USE_COHERENT_MEM       :=      1
+RESET_TO_BL31          :=      1
+ARM_GIC_ARCH           :=      3
+MULTI_CONSOLE_API      :=      1